Update JR to 3.3.0 snapshot and update test for re-calculation in field list #4845
Conversation
|
@seadowg please verify that my proposed sequencing is ok with you (prioritizing QA over updating the test). |
collect_app/build.gradle
Outdated
| } | ||
| implementation 'net.sf.kxml:kxml2:2.3.0' | ||
| implementation 'org.apache.commons:commons-csv:1.4' | ||
| implementation files('javarosa-3.2.0.jar') |
There was a problem hiding this comment.
This is still 3.2.0 because it's off the unmerged getodk/javarosa#646 but it's the release candidate for 3.3, basically.
|
@lognaturel yeah seems good! I'll add "needs testing" to this. I'll also just make it a draft so it's even clearer it's not for merging. |
|
I thought the build failure might have been something intermittent but was wrong. I assume it has to do with including the jar. |
|
@lognaturel definitely could be. @mmarciniak90 @kkrawczyk123 this is still good to test even though the build is failing. We'll sort all that out when we've merged the JavaRosa PR. |
| .clickOnText("A") | ||
| .clickOnForm("Relevance and calculate loop") | ||
| .answerQuestion(1, "B") | ||
| .scrollToAndAssertText("third") |
There was a problem hiding this comment.
This feels awkward but I couldn't find a better way to make sure that the third question was displayed on a short screen. Scrolling to the question text is insufficient because the edittext needs to be on-screen.
| @@ -171,11 +171,6 @@ public FormEntryPage clickRankingButton() { | |||
| return this; | |||
| } | |||
|
|
|||
| public FormEntryPage putTextOnIndex(int index, String text) { | |||
There was a problem hiding this comment.
I moved and renamed this because it took me a long time to find it.
|
Tested with success Verified on Android 8.1, 9.0, 10.0 Verified cases:
Verified forms from project 340
|
|
Verified also on Androids 5.1 and 11. |
|
@lognaturel I think we can do a snapshot and then upgrade Collect to that now as part of this PR. |
|
Thanks, @kkrawczyk123, @mmarciniak90! @seadowg did you review the test change? I’ll update the first commit in the next 24hrs to use the snapshot but you could look at the test if you haven’t already. |
|
@lognaturel ah sorry I thought you hadn't got round to that because of the failures but looks like those are just mem issues. Will set myself as a reviewer. Circle CI won't let me rerun annoyingly as it's your PR! |
lognaturel
changed the title
Update JavaRosa to v3.3.0-SNAPSHOT. getodk/javarosa#646 and getodk/javarosa#644 have been QAed.
I've updated the test that no longer fails with the form from #4170. It's an extension of the problem that the old form displayed -- there's still a calculate being used as a default but then there's also relevance in a field list added to the mix. I'll cherry pick that commit when we have a real PR updating JR. I wanted to give @seadowg a chance to review in the meantime.
Side note, we could likely change the order of relevance update and field list re-rendering so that there wouldn't be an exception in that case. However, similar to the other problems from #4750, the form is nonsense so it's good that there's a crash. As we make more improvements to field lists, it might go away and then this test can be removed.
Initial description for QA
NOT FOR MERGINGThis is so that @getodk/testers can verify getodk/javarosa#646 and getodk/javarosa#644. As a side effect, the cases described at #4750 should no longer show errors.
Related to the last point, there is now a failing connected test. This is discussed at getodk/javarosa#646 (comment).